Don't be too strict when checking icon flags. (#435062)

2007-05-01  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkiconcachevalidator.c: Don't be too strict when checking
        icon flags.  (#435062)

svn path=/trunk/; revision=17767

diff --git a/ChangeLog b/ChangeLog
index 26fd720dc5773bdf03c581ae37df1211abb09b38..9f9c38383b638cd86a7953cfa09c2f468b5cb76c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-01  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkiconcachevalidator.c: Don't be too strict when checking
+       icon flags.  (#435062)
+
 2007-05-01  Matthias Clasen  <mclasen@redhat.com>
        
        * gtk/Makefile.am: When generating gtkbuiltincache.h, only copy

diff --git a/gtk/gtkiconcachevalidator.c b/gtk/gtkiconcachevalidator.c
index cb1d964ba74048c610c082349727bb71dead5495..21c4ec205995729a5decadef400bcc958ffe6e47 100644 (file)
--- a/gtk/gtkiconcachevalidator.c
+++ b/gtk/gtkiconcachevalidator.c
@@ -23,7 +23,7 @@
 #include <gdk-pixbuf/gdk-pixdata.h>
 
 
-#define VERBOSE(x) 
+#define VERBOSE(x) x
 
 #define check(name,condition) \
   if (!(condition)) \
@@ -262,8 +262,7 @@ check_image (CacheInfo *info,
          get_uint32 (info, offset + 4, &image_data_offset));
 
   check ("image index", index < info->n_directories);
-  check ("image flags", flags == 1 || flags == 2 || flags == 4 ||
-                        flags == 9 || flags == 10 || flags == 12);
+  check ("image flags", flags < 16);
 
   if (image_data_offset != 0) 
     {